Merge changes from topic "am-f1c1d5f86e94468da7d28e9b659cd986" into main

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE Added limitations for attributions to handle invalid cases" into tm-dev am: e64b8b6ec8 am: df28c1a9b8 -s ours am: d46be3a9f5 -s ours am: 8b2ed53df4 -s ours
  [automerger skipped] RESTRICT AUTOMERGE Added limitations for attributions to handle invalid cases am: 63d122cf0e am: 720bbf8da3 -s ours am: a04af28071 -s ours am: 3a204839fb -s ours