corner stone
Merge branch 'feature/card_common' into develop