Merge branch 'ob/sequencer-rearrange-cleanup'