Merge changes from topic "am-d938b2ce92824bd2ad0da9b015c6dbd9" into main

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into sc-qpr1-dev am: 14972350 -s ours am: 12c5b87e -s ours am: d9a56a29 -s ours am: 2ebcd9c0 -s ours am: 7e99b489 -s ours am: 4d6da525 -s ours am: 4e2ee8fd -s ours am: c90098f9 -s ours am: 4b03263b -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Drop invalid data. am: 0d7b166f -s ours am: fe5d8bc4 -s ours am: 76c87469 -s ours am: 8f947846 -s ours am: 9711e1b2 -s ours am: 4d35fb92 -s ours am: a4dfb135 -s ours am: e1462725 -s ours am: ca6cabb2 -s ours