Merge debugging modifications into main