Merge "Use WeakReference to hold target in values." into rvc-dev