CM 11 Manifest upstream update