Merge branch 'net-smc-improve-termination-handling'