Merge change 20578

* changes:
  Better ripples and leaves