Merge branch 'zj/diff-empty-chmod'