Version 1.8

Change-Id: I695ba7c350bd0e77cee645f01f0cebce51f330fa