*more changes on DO-5396
Merge pull request #558 from cyrilraja/master

*more changes on DO-5396