Merge branch 'maint-1.6.1' into maint