Merge "7/n: Add mechanism to hold onto already-completed operations" into sc-dev