Merge "Avoid JS error when a change has no id" into feature/zuulv3