Merge "Catch gear.InterruptedError" into feature/zuulv3