Merge pull request #5011 from kumpera/quiet-mode