Merge branch 'release/1.6.1' into production
Merge tag 'v1.6.1'

1.6.1