Merge "Reestructuring the clamp doc tree"