check in changes for DM-958