Imported updates for v1.1 release