Merge branch 'pf/editor-ignore-sigint' into maint