Merge "Fix invariant in reference type propagation."