Merge remote-tracking branch 'gooru/master'
Merge remote-tracking branch 'gooru/master'
Merge remote-tracking branch 'gooru/master'
Merge remote-tracking branch 'gooru/master'
Made few changes for the task CORE-4968
Merge pull request #446 from saravanab/master

Made few changes for the task CORE-4968