[FIX] Packaging: review of the 11 former cherry-picks to fit v7