First commit of DebugTools in 62x with cherry-pick