Thanks a lot for your feedback Mahendra. I have rebased the changes. I'll follow up on your other comments regarding cleanup and the shortened flag name. I'm currently uploading the latest version post rebase as I've made some changes to fix the test failures. Will let cfbot run those once.
