Merge "[8/N] per-user global verification policy" into main