Merge branch 'set-commit-date'