Merge commit 'e7884d68a613e579a12a52455f6b5b13a90a0f8a' * commit 'e7884d68a613e579a12a52455f6b5b13a90a0f8a': Don't crash when extra logging is enabled.
Merge commit 'e7884d68a613e579a12a52455f6b5b13a90a0f8a' * commit 'e7884d68a613e579a12a52455f6b5b13a90a0f8a': Don't crash when extra logging is enabled.