Merge branch 'smc-fixes'