Merge "Use undefined values instead of 40 zeroes" into feature/zuulv3