Merge branch 'wzd'