Merge "Follow framework change to track started ops by proc."