Created attachment 8644 [details] patches cherry-picked from master This makes this tool more robust.
Comment on attachment 8644 [details] patches cherry-picked from master Looks good
Pushed to autobuild-v4-0-test.
Pushed to v4-0-test. Closing out bug report. Thanks!