Vipin | #1158, #1160, #1173 | all changes related to
these cards
Sush, Vipin | --- | Fixing merge conflicts and test