Merge "Fix broken @see/@link references controls" into main