Merge branch 'release/2.4.0.1' into develop
Migration to 2.6
Bump version to 2.6.1.0
Merge branch 'release/2.6.1.0'