Merge branch 'rs/apply-epoch'