Merge changes from topic "am-be9c4f61597346b5907ba69dadf65eb4" into main

* changes:
  [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-dev am: 4b073bf1 -s ours am: 1a8d068b -s ours am: f5bb4f2a -s ours am: d1e10278 -s ours
  [automerger skipped] Ignore fragment attr from ext authenticator resource am: 24e2f2d2 -s ours am: f3a110e7 -s ours am: 32d00469 -s ours am: 7e7cd062 -s ours