New upstream cxxcam
wip