Merge pull request #2138 from suryanarayanakb/dev-branch

"Added the removed code while merging"