Merge "Modify cmHandle registration for alternateId"