Merge "When we update slow we override the current state. Make sure to reset the state the operation finishes." into nyc-dev