Merge branch 'en/merge-options-doc'