Merge pull request #11801 from howels/MSP_CRAFTNAME-lengthfix