This must be a cumulative patch against master.