usr, merge in Uganda ureport changes