Merge "Editor component"