Packages from the vendor hrsa

hrsa/redo