Bump to v2.6.1
Merge branch 'release/2.6.1' into dev