Merge branch 'jh/maint-config-file-prefix' into maint