Code

Merge branch 'zj/diff-stat-dyncol'