Merge tag 'v2.8.0-rc4' into develop