Merge branch 'ak/t5516-typofix' into maint