Merge branch 'minor-fixes-modules-spelling'
Merge branch 'master' into custom-generators