Merge branch 'jn/maint-sequencer-fixes' into maint