Merge remote-tracking branch 'gooru/master'
*Fixed , more changes on DO-4824
Merge remote-tracking branch 'gooru/master'
Revert "*Fixed , more changes on DO-4824"

This reverts commit 652ed708eff24950178378067fe9e98358a9a694.
Merge pull request #310 from cyrilraja/master

more changes on DO-4824