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