Merge branch 'jk/autoident-test'