Merge "Add a V->U restore allowlist/denylist" into main