Merge branch 'release/3.8.0'