Updates for CM-10.2