DOCS-710 organizational prep