Merge branch 'net-some-build-fixes-and-other-improvements'