Adapt to latest SDC change for SOL004 compliance