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

2.6.1