NO-SNOW: Merge back 1.51.1 release changes (#4242)