Backport logger-1.4.3 from #9392 to 3.9-stable