Merge tag 'v3.3-rc3' as we've got several bugfixes in there which are