Merge removal of issue 20317 debugging code from 3.3