Merge "Fix CUJ getNameOfCUJ" into main