Backport changed from PET