Code

Merge branch 'jc/diff-stat-scaler' into maint