Thanks Amul, this looks pretty straight forward. LGTM.I have also run the regression on master and seems good.
Regards,Jeevan Ladhe