Merge "Better exception handling during autohold" into feature/zuulv3