Merge branch 'hotfix/7.9.0' into production
Merge branch 'production'