Merge remote-tracking branch 'stantrc/net-bt-merge' into master-maliv3