merged changes from CM