SES-2126 : Port the integer, decimal, double simplification from 2.8.x