Imported changes from Paladio