backport the changes to render/ from the alttab branch (commit 3592046b2b26e05ee94c0d...