release1.8 prep
Merge branch 'release/1.8'