Merge "Add report header to failure diagnostics" into main