Merge "Revert "Fixes and improvements in ReferenceTypePropagation""