[PLAT-5322] Tweaks to custom notional handling