Merge "Enable ds-docs-switched"