[BUGFIX beta] Provide better debugging information.
Merge pull request #4916 from rjackson/better-instrumentation-display

[BUGFIX beta] Provide better debugging information.