Merge "Ensure paused ops are finished correctly" into sc-dev