Merge branch 'smp-fix'