Merge change 972 into donut

* changes:
  Back-merge all changes done in master to DumpRenderTree to donut.