v1.52.5 - #29249792