Merge branch 'hotfix/7.4.1' into production
Fix it this time
Merge branch 'hotfix/7.4.2'