Merge branch 'jk/rebase-i-drop-ident-check'