Merge "RESTRICT AUTOMERGE: Drop invalid data." into sc-qpr1-dev