Merge branch 'jk/ident-empty' into maint