Merge patch-1 to cards-broken