UC-54 More changes from merge