Made changes pertaining to Task DO-5232
Merge pull request #517 from saravanab/master

Made changes pertaining to Task DO-5232