Merge "RESTRICT AUTOMERGE: Drop invalid data." into rvc-qpr-dev