fixed a bug fix around card profile
Merge branch 'master' into bug_fix_card_profile