Adding fix for CEP-907

To handle regression issues caused by fix on CARBON-14867