Merge change 21847 into eclair

* changes:
  Tweak the water and its texture