update ROW to upstream 3.4