Merge branch 'rd/doc-options-placeholder'