Merge change 24675 into eclair

* changes:
  change default for dither to true