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