Merge branch 'net-ipa-fix-some-new-build-warnings'