Merge branch 'ak/apply-non-git-epoch'