Merge change 8426

* changes:
  Fix bug# 1997056