Merge branch 'vs/typofix'