Merge "RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids" into qt-dev