Merge "Fix broken copy after recent copy related chagnes."