Merge change 9363

* changes:
  Start using lvals and rvals.