Merge "Add suffix number when copying a file." into nyc-dev