Merge "Prevent crash when dumping large buffers when tracing" into main