PLAT-4100 - Reapply YIELD_CURVE_DATA related changes lost in the merge