Merge changes from topic "am-0d8057e4fd58491aa2ad8537f650318b" into main

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into rvc-qpr-dev am: fc881f5d -s ours am: 9b791f0b -s ours am: 15c48d54 -s ours am: 5ca3ba7c -s ours am: e69d9c81 -s ours am: 0ccd5466 -s ours am: 5e3b1152 -s ours am: 9c02668a -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Drop invalid data. am: 68686110 -s ours am: 6006ebee -s ours am: dc69ac89 -s ours am: 01b73e79 -s ours am: 1e0028e9 -s ours am: 5691035b -s ours am: a66123bf -s ours am: c43898ea -s ours