Updated cards with all upstream changes.