3.01 support
Merge branch 'release/v3.0.1'