Merge "Fix a segmentation fault in NoStaleEvents tests" into main