Progress on 'CVV is unsupported'

#438 strikes again