New upstream version of UPF