Merge "RESTRICT AUTOMERGE: Autocork package invalidations" into rvc-dev