Packages from the vendor consolidate

consolidate/ticket