Merge "Revert "Revert "Revert "Revert "Fixes and improvements in ReferenceTypePropagation"""""