Merge branch 'fixes-v3.0-rc3' into devel-fixes