Merge branch 'net-smc'