Merge in v3.0.0