Merge change 20686

* changes:
  fix the build