Upgrade packaging to 20.9