Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3