Merge branch 'ps/format-padding-fix' into maint-2.30