NO SNOW: 1.53.0 merge back (#4283)