DEV-18051
DEV-18083
Merge pull request #16 from Unact/master

merge