Merge "sde: Add Scalar class to handle the featurization"