Merge interrupt changes