EAGLESIX-3077: Added code for interrupt as suggested per PR