Release version 2.6.1.0
Merge branch 'release/2.6.1.0' into develop