Release 2.6.1
Merge branch 'release/v2_6_1' into dev