Merge change 2466

* changes:
  Rename Calc sample to Fountain.