knz Merge pull request #12662 from knz/fix-clog …