1.13_PRE3 cherry picked