Merge "Fix bugs with strong versus weak reference paths."