Final changes for 1.8
Merge branch 'release/1.8' into develop