Manually merged Eugenies changes.