Merge "Validate cmstarthexsortkey/cmendhexsortkey to be valid hex"