Merge 2.7.x branch to master (#784)