Merge branch 'fix_commit_time'