Merge change 20424

* changes:
  Fix the scanning panic issue