v2.6.1
Merge branch 'release/2.6.1' into production
Merge tag 'v2.6.1'

v2.6.1