Merge branch 'vl/typofix' into maint