Merge tag 'v3.6-rc4'