Merge pull request #2036 from github/backport-v2.22.11-b374143c1 #1304

Job	Run time
Diagnostic export (ubuntu-latest, stable-20230317)	1m 4s
Diagnostic export (macos-latest, stable-20230317)	2m 33s
Diagnostic export (windows-latest, stable-20230317)	3m 49s
Diagnostic export (ubuntu-latest, latest)	1m 18s
Diagnostic export (macos-latest, latest)	4m 55s
Diagnostic export (windows-latest, latest)	3m 1s
Diagnostic export (ubuntu-latest, nightly-latest)	1m 15s
Diagnostic export (macos-latest, nightly-latest)	5m 6s
Diagnostic export (windows-latest, nightly-latest)	3m 26s
	26m 27s

Provide feedback