Changes for the temporary CE build. This commit SHOULD NOT BE MERGED INTO MASTER