Merge branch 'in_interrupt-cleanup-part-2'