Merge branch 'sb/t9300-typofix'