Merge branch 'net-smc-fixes-2020-10-23'