Merge branch 'editor'
add new Feature in Editor.