Merge "Update package prepare scripts"