Packages from bug-979