Merge change 7489

* changes:
  More test app work