Fix buildout since the change of the package
Merge branch 'develop' into feature/compatibility