Merge change 9779

* changes:
  Fix uninitialized variable loop