Merge branch 'netsec-fixes'