For 7.x.2.x branch the above patch #9 is working fine.