Weekly 1.8

Change-Id: Icd07d6ebe9f39db4b37dfccb5240abf337e36b9d