enable deployment modules only when available
Merge branch 'hotfix/0.6.1'