Update v1.8

Update Master to v1.8