Merge fixes up to 3.0.1