FORGE-1904: Fixed ConverterFactory for primitive conversions