no more lock de z
Merge pull request #7 from codjo-sandbox/integration

For release 2.8