Merge "Replace equals None with is None" into feature/zuulv3