Merge branch 'jk/push-option-doc-markup-fix' into maint