#1468 for 4_6_x