initial changes for cm10.2