Merge pull request #6324 from keymanapp/fix/developer/prevent-execution-point-breaking-editor-location fix(developer): prevent execution point breaking editor location ✂