Links for upstream-gen