Merge pull request #18864 from demeritcowboy/logz