Merge "Refactor with ToTargetCompatibleHandle()"