Merge "None does not compare to int" into feature/zuulv3