Add sample-card
Merge remote-tracking branch 'origin/master' into sample-card
Merge branch 'sample-card'