Merge change 3446

* changes:
  Add missing system properties to sim.