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