Merge remote-tracking branch 'gooru/master'
Made Changes pertaining to task DO-5232
Merge pull request #507 from saravanab/master

Made Changes pertaining to task DO-5232