Merge branch 'sg/test-rebase-editor-fix'