Manual datacenter unification #84