Merge "Persistent configuration should only be updated by currentUser" into main