Merge upstream rendr changes