Merge branch 'lq-editor-refactor'