Merge commit 'a95e1cd1f846a949663e33e5a93f689702415b5a' * commit 'a95e1cd1f846a949663e33e5a93f689702415b5a': Work on issue #2163789: Way too much logging