Merge change 20304 into donut

* changes:
  More work on issue #2030135: Device sluggish