Merge "Remove unused method term_handler" into feature/zuulv3