Merge "Add logging to see thread interruptions"