Merge "Remove use of hacking lib" into feature/zuulv3