Merge changes with 3.0.1