Merge "Make operation counts monotonically increase." into ics-mr1