Merge "RESTRICT AUTOMERGE Fixed leak of cross user data in multiple settings." into rvc-dev