Merge "Eliminate duplicate toctree references"