Merge change 20217

* changes:
  Draw untextured water mesh