Packages from the vendor fixme

fixme/ordering