Merge debug print removal with 3.3.