Merge pull request #18443 from WereCatf/hexedit