Merge "Fix @link annotation in documentation for hyperlink generation"