Merge changes from topic "am-9335cd4f1fa644e09debafe6c6a84c8f" 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: 1f0356db -s ours am: b1f83dbf -s ours am: 340f7146 -s ours am: 7260c45d -s ours am: dfec21c0 -s ours am: 52ea475f -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: 4c1ead9b -s ours am: 6de7f78d -s ours am: b54860e3 -s ours am: 3bca4064 -s ours am: 896304cd -s ours am: 20dc92de -s ours