Makes cvv_response optional

Fixes #3330