Merge branch 'sb/sequencer-abort-safety'