Merged manually.
The editor changes to support this are on the editor-issue/CONFDEV-13204 in Confluence.
The editor changes to support this are on the editor-issue/CONFDEV-13204 in Confluence.