Merge branch 'jk/reset-ident-time-per-commit'