DOCS-972 sync from hidden members

Can be merged upon Sam approval.