Merge branch 'sh/smp'