Only set outputmode if process starts
Merge remote-tracking branch 'upstream/master'