Apply latest CM-11 commits