Merge "(refs #7526) Allow population of UC to diagram directly"