misc fixes
Merge branch 'release/1.8'