Changed PreserveReferencesHandling