Merge branch 'smc-fix'