Merge "Card mark holding class instead of declaring class"