Packages from the vendor cherrypick

cherrypick/hammertime