Remove debugging mode in old codebases cleanup.
Merge branch 'refs/heads/master' into 2.2.x-legacy