Merge change 20878 into donut

* changes:
  Fix issue #2048263: More debugging information