Modules list fix
Settings hotfix
Merge branch 'develop'