Merge branch 'maint-1.8.1' into maint