Merge 3.0.1 into releases