Merge branch 'raid-fix'