Fixing vendor issue.
Merge remote branch 'origin/checkbook_edc' into checkbook_edc