Merged back changes further for ConversionRateType -> ExchangeRateType