CLC-2668 Fix failing CFV test
Merge pull request #1674 from ctweney/clc-2668

CLC-2668 Fix failing CFV test