Merge change 7537 into donut

* changes:
  Fixing a race condition that causes synthesis to not be aborted even if stop is called.