Merge "Fixes and improvements in ReferenceTypePropagation"