INTC changes to consume for RISCV