DOCS-1770 administration reorganization