Merge change 6315

* changes:
  should fix sim build