Removed code inadvertantly introduced in branch
Addressed PR review comments
Merge pull request #2626 from aparajit-pratap/Intellisense

Addressed PR review comments