Merge branch 'jk/chopped-ident'