Merge branch 'sb/t6031-typofix'