In the middle commit for the debug manager