Merge "Fix a bug in reference type propagation."