Merge "PRH simulators refactor"