Code preparation for widening windows (#10900)