Merge branch 'sg/t6050-failing-editor-test-fix'