Merge branch 'rh/merge-options-doc-fix' into maint