Merge branch 'rs/sequencer-rewrite-file-cleanup' into maint