Merge changes from topic "am-b44fb1c6e5454f61a5a354c5685fd281" into main

* changes:
  Merge changes from topic "parse-authority-sc-v2-dev" into sc-v2-dev am: a7e93180 am: 6ffe9179 am: 51595bbb am: a442c761 am: 387a419a am: 1580da75 am: 4128b2b3
  [automerger skipped] [RESTRICT AUTOMERGE] Parse authority to separate userId and non-user parts of it am: 64ea737d -s ours am: b015c78c -s ours am: cf386f79 -s ours am: d606e3c0 -s ours am: d87878b5 -s ours am: 9499d3e6 -s ours am: 9107cd80 -s ours