CLC-3610 Simplify cal1card feed structure
Merge pull request #2380 from ctweney/clc-3610

CLC-3610 Simplify cal1card feed structure