1.8.0

Merge 1.8.0 changes