[#32006] Improvements to JHelper and JUcmType (Fix #1975)