Merge branch 'en/sequencer-empty-edit-result-aborts' into maint