Merge change 21831 into eclair

* changes:
  Add reflections to the water