Merge changes from topic "am-3b28aeb8fb7c4932afc4ce229bc4a7de" 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: fb860479 -s ours am: 715a31e1 -s ours am: f16e742d -s ours am: 9d02a3ac -s ours am: 6602b481 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Drop invalid data. am: 0d7b166f -s ours am: fe5d8bc4 -s ours am: 76c87469 -s ours am: cc88443d -s ours am: 8eba7b1d -s ours am: 6c930547 -s ours am: 6510df08 -s ours am: 09dd2021 -s ours