Merge branch 'jk/robustify-parse-commit'