update version v2.6.1
Merge branch 'release/v2.6.1' into develop