Merge branch 'hotfix/2.7.1'
Merge branch 'master' into develop