Merge branch 'release/2.6' into develop
Merge branch 'release/2.6.0'