Merge tag 'v4.2-rc4' into devel