Merge branch 'sb/status-doc-fix' into maint