Merge pull request #26005 from jedisct1/kt128r