Merge remote-tracking branch 'upstream/dev' into dev
Merge remote-tracking branch 'upstream/dev' into dev
Remove dead code
Merge pull request #804 from andrerod/dev

Remove dead code
Make domain UT always mocked