Merge "[0002] Fix segfault from bad CiCam closure" into main