#858 Packages modifications