Merge "Keep members needed for downstream weak refs" into main