Cherry-picked 1.18.1_PRE1
Cherry-picked 1.24.0_PRE1