Merge branch 'ab/doc-no-option-notation-fix' into maint