Small debugger fixes and enhancements
Merge pull request #4675 from Kingcom/Debugger

Small debugger fixes and enhancements