CM 11 upstream changes