Merge branch 'net-address-some-sparse-warnings'