Fix Bug 1003995: High Priority Copy Changes