Forward port of #5751 to 7_3_X

Forward port of #5751 to 7_3_X