Merge change 7806

* changes:
  Fix fountain and more rollo ui work.