Merge "Only call finish on operations that have started." into nyc-dev