Merge "Add some @see to doc blocks"