Issue: ORN-2026-40