Merge change 2359 into donut

* changes:
  Fix for the simultor build breakage.