Merge change 10723

* changes:
  Fix variable names related to bytecode tracing.