Merge "Cleanup of ForEachParams in cpu ref"