[nobug] Update for debug core internal changes
3 files changed