Merge "Fix for retry mechanism on concurrent CmHandle registration"