Merge branch 'hotfix/2.7.1'