Merge branch 'jc/ident' into next