Merge branch 'more-configuration'
Merge branch 'master' into more-configuration