Improvements and optimizations to vapour
Merge pull request #3228 from masterbee/hotfix-isDisabled

Improvements and optimizations to vapour