Merge branch 'release-3.0.1'