Merge "Revert^2 "Allow collecting diagnostics from shell commands"" into main