Merge "Fix null ref in github tests" into feature/zuulv3