Merge ""x/ref": Update w.r.t to CL #9371"