Changes for CM 10.2