Merge tag 'v5.5-rc3' into devel