Merge tag 'v3.9.0a6'