Merge branch 'ad/rebase-i-serie-typofix' into maint