Merge "APIs to watch active op changes"