Stable 1.8

Change-Id: Ieaf551a59adf03ceb1ba0abe2e61984fe21b0203