Merge change 23583 into eclair

* changes:
  Update fountain to use structures.