Merge change 8402 into donut

* changes:
  Add test application