Pull in changes from the original ureport code base