Merge "Update packaging"