Merge branch 'smc-next'