Merge branch 'net-ipa-endpoint-configuration-fixes'