Merge "Always log stdout and stderr of CLI commands"