Merge tag 'v2.6.0'

v2.6.0
Fix the doc link
v2.6.1
Merge branch 'release/2.6.1' into production