Merge "Allow collecting diagnostics from shell commands" into main