Merged editor_v1 into editor_v2