Merge changes from topic "am-b4583cf98b244cc7b296cc30c435ef04" into main
* changes:
Merge changes from topic "parse-authority-udc_dev" into udc-dev am: 4307b622 am: 4938cb6d
[automerger skipped] [RESTRICT AUTOMERGE] Parse authority to separate userId and non-user parts of it am: 97e34e5a am: 2440bc95 -s ours