Merge changes from topic "am-6d493f05405449c4a85ab0f030f93ea3" into main

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into rvc-dev am: 60529947 am: 43304556 -s ours am: d2a0328e -s ours am: 5cb0cf9b -s ours am: 4f322f25 -s ours am: a8ccab0e -s ours am: 3c22cb47 -s ours am: e65e810f -s ours am: 86ad063e -s ours am: 9a79881d -s ours am: caba8f33 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Drop invalid data. am: 62b37ab2 am: d6e366e2 -s ours am: 436b2ec7 -s ours am: 6f4389a1 -s ours am: 0eee64f8 -s ours am: 9c084b4a -s ours am: 7d298bb3 -s ours am: 51dcd0fc -s ours am: 3c2c3ad2 -s ours am: f00e71ae -s ours am: 183309c8 -s ours