Merge branch 'ls/p4-doc-markup'