Merge branch 'feature-scaler'