Merge branch 'hotfix/h2' into production
Typo fix
Merge branch 'hotfix/h3'