Patches pushed as 2bff47092002ab2d6e4fd4961a79a25a4343ae45 and following
with some modifications (extra phase to fix the tests of zr-utils).
Thanks.