Merge "Improvements to Copy/Move flow." into nyc-dev