Merge pull request #7531 from neheb/loud