Merge "Increase the space used by properties filenames" into main