latest changes from Iguana applied