Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scaler