Merge "RESTRICT AUTOMERGE: Add a "cork" mechanism to prevent cache invalidation flooding" into rvc-dev