Merge branch 'net-ipa-a-mix-of-cleanups'