Merge branch 'en/typofixes' into master