Merge branch 'sg/t3020-typofix' into maint