Merge pull request #3086 from rubenk/reduce-configure-noise