Merge "Set CujType int values correctly"