Merge branch 'jk/ident-split-fix' into maint