v1.61.9 - #33734910