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