Merge tag 'v3.7-rc3' into HEAD