Part 1 of UU/UB changes

Changes are done (in the order in Krill's latest changelog) through
India (with the exception of the Fast Worker)