Merge "Fix the logic to add suffix when copying." into nyc-dev