Merge changes from topic "am-b0e42e0800384d26977a77d2b3a91f04" into main

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into tm-dev am: b817c5e2 -s ours am: 9cfa634e -s ours am: e8960583 -s ours am: 981a4dcd -s ours am: fcf88757 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Drop invalid data. am: 3c5aa21b -s ours am: e76d1bed -s ours am: 27139453 -s ours am: 5ff6639a -s ours am: 7a4f0626 -s ours