Merged forward changes for ck5 build