Packages from the vendor filipbs

filipbs/f-user