Merge branch 'sn/doc-opt-notation' into maint