Merge "Don't overwrite persistent property files" into main