Fix merge conflict. The btdebugs were all gone on 8_2-branch
but I let this code change in. #4605