Merge "Remove generic_setup_package() function"