Merge with 3.0.1