Merge branch 'release/2.6.0' into production
Merge tag 'v2.6.0'

2.6.0