merge in CM-11.0 and missed CAF commits