Feature #1544 generate_numeric_field improvements

Feature #1544