Hi @sonvir,
Re-rolled the patch with the latest changes. Thanks @sumitmadan.
...