Merge change 20927

* changes:
  Workaround for issue 2046783.