DEV-56
- wip
Merge pull request #20 from evrythng/ENGINE-731

DEV-56
ENGINE-731
- integration test missing
Merge pull request #21 from evrythng/ENGINE-731

ENGINE-731
Merge branch 'master' into ENGINE-713