Merged editor_v2 into editor_v1