Merge branch 'hotfix/5.7.4'