Merge "Fix broken @return documentation"