Merge changes from topic "am-e3b61c3e440141b9849a52e97675dce8" into main

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into tm-dev am: b817c5e2 -s ours am: 29e8c9a1 -s ours am: fa4c7e73 -s ours am: 0977328f -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Drop invalid data. am: 3c5aa21b -s ours am: f53bc451 -s ours am: c6e61ed1 -s ours am: df93b87d -s ours