Merge branch 'mi/typofixes' into maint