Merge "Make sql reporter score null when not set" into feature/zuulv3