Merge branch 'release/2.7.0' into production
Merge tag 'v2.7.0'

2.7.0