Merge "Use efficient coverage dumping mechanism" into main