Merge branch 'pb/trim-trailing-spaces' into maint