Merge with 3.0