Corrected an issue with disabling the V2 API support in cmake-based builds.
ckp
ckp
ckp
ckp
add back v2 interface
ckp
add back v2 interface
pre-rebase
missing files