Merge branch 'zdr'