Merge change 20865

* changes:
  Fix the build