Merge branch 'hotfix/3.7.1'