Prepare release 2.6.0.1
Merge branch 'release/2.6.0.1' into develop