Merge pull request #18239 from demeritcowboy/gencode-checksum