Merge change 20140 into donut

* changes:
  Work on issue #2030135: Device sluggish