Update module settings.
Merge remote-tracking branch 'origin/master'
Misc refactorings.