Add module to enable
Merge branch 'release-1.1'