Merge branch 'rd/typofix' into maint