Merge "Only rewrite file when there has been a change to a list of users" into main