Merge "Remove NullChange" into feature/zuulv3