Merge change I866cc5d6

* changes:
  Improve run-core-tests.