Changes imported from Prato instance