Merge branches 'sh/smp' and 'sh/stable-updates'