am a1e50cab: Merge "More use of WellKnownClasses for debugger"

* commit 'a1e50cab308af9f9a94e8bd370111eeff5634914':
  More use of WellKnownClasses for debugger