Imported 1.1 changes