Merge branch 'zbd'