Merge "Fix in reference type propagation"