Merge "Switch to late-binding inheritance" into feature/zuulv3