These patches are for 7.3 and trunk.

Best,
Hui