Packages from the vendor zhr

zhr/newlink