f0nzie zbook Merge branch 'release/0.99.6'