Merge change 2792

* changes:
  get rid of utils.h