Merge branch 'js/replace-edit-use-editor-configuration' into maint