Merging changes from eucalyptus