Merge change 898

* changes:
  Fix the build