Merge "Move manifest toctree context"