back to release version
Merge branch 'release/2.6.0' into develop