Make it suitable for clibs.
Merge branch 'release/3.0.1'