Merge tag 'v7.2.0-rc4'