Fixed #9310: backported logging fix from 2.7.
2 files changed