Merge change 6497

* changes:
  Start tracking types in expressions.