Merge branch 'release/3.9.0'