Merge branch 'SMC-fixes'