Merge branch 'en/zdiff3'