Merge branch 'mw/doc-merge-enumfix'