Merge branch 'maint-1.6.0' into maint