Hi,
Rerolled the patch and fix few issues. Please review the patch.
Thanks!