Merge branch 'jc/doc-merge-options'