Merge "Update the closed loop scenario" into casablanca