Merge changes from topic "am-f01379e781ee49a5bde13de82286755f" into main

* changes:
  [automerger skipped] Merge "Drop invalid data." into tm-qpr-dev am: 99f65269 -s ours am: 8a039a77 -s ours am: 1d57012d -s ours am: d0cb03e8 -s ours am: 1566b4d9 -s ours
  [automerger skipped] Drop invalid data. am: a5182ce1 -s ours am: d79f91f2 -s ours am: 325774b8 -s ours am: 0816cb76 -s ours am: 6a9afe3b -s ours