Merge "Added OOS simulation option"