Merge branch 'jc/ident'