Merge branch 'jc/apply-epoch-patch' into maint