PR #9702 review: Domain cutover prep