DEP-45 enable improvements
Merge pull request #43 from maciejborkowski/dev

DEP-45 enable improvements