Merge tag 'v3.7.0a4'