Revert "Revert "Merge branch 'CECommunity'""

This reverts commit e88edb3801c37c3bb4d156512c7c035de6d003e0.