Merge "Simulator updates"