Merge tag 'v3.7-rc4' into upstream-master