Merge tag 'v3.7-rc1'