Merge pull request #18782 from demeritcowboy/logging-binary2