Merge change 6718 into donut

* changes:
  Fix bug #1873249i: Apps can DoS/brick device