*more changes on CORE-777
Merge pull request #204 from cyrilraja/master

*more changes on CORE-777