Merge changes from topic "am-f7af97a5e4d3441fb11371222d93af5c" into main

* changes:
  [automerger skipped] Merge changes from topic "parse-authority-tm_dev" into tm-dev am: d82082c2 -s ours am: 8dc996e9 -s ours am: 7efc930b -s ours am: b3808d38 -s ours am: 677bc14b -s ours am: eb89853a -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Parse authority to separate userId and non-user parts of it am: 9f9a68e9 -s ours am: 89ead8d5 -s ours am: 60310d0e -s ours am: a3f7b994 -s ours am: fd8421d4 -s ours am: ae974e9a -s ours