Merge change 7790

* changes:
  Track lvalues vs. rvalues.