Merge pull request #9102 from annando/update-logging