Merge change 24595

* changes:
  Display additional information on stack overflow.