Merge "Fix for interrupted exception"