Merge "New packaging script"