Merge changes from topic "am-31ce508f6d2e4100bf03b765275d4e1a" into main

* changes:
  [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-qpr-dev am: d8a7ed64 -s ours am: ce082092 -s ours am: 64fb2b41 -s ours am: bafba4df -s ours
  [automerger skipped] Ignore fragment attr from ext authenticator resource am: f5e9b016 -s ours am: 5691154d -s ours am: a7721794 -s ours am: d4d25bf8 -s ours