Merge change 9400

* changes:
  Implement pre-increment / pre-decrement