Merge debug output removal with 3.2.