Merge branch 'jk/chopped-ident' into maint