Merge change Ia0e7b60d

* changes:
  Remove incorrect definition of nested local variables.