Merge "Rename file to avoid duplicate file names" into main