v8.0 merge