Merge branch 'ld/p4-editor-multi-words'