Merge pull request #310 from cyrilraja/master

more changes on DO-4824
*more changes for DO-4824
Merge remote-tracking branch 'gooru/master'