Merge changes from topic "am-09b1e236225e4b2d8804a0b6402f3641" 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: 4edb275b
  [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: e63cfb3a -s ours