Made Changes pertaining to the task DO-5147
Merge pull request #482 from saravanab/master

Made Changes pertaining to the task DO-5147