I currently have it implemented as setting the return point to the final instruction prefix issued when an hardware interrupt (IRQ) is encountered during a REP prefixed instruction. So it will now only return to the final prefix issued when the hardware interrupt is serviced.

Somehow, the Checkit! Diagnostics still detects the CPU Interrupt bug as failed. Anyone knows what the cause of this is?