Merge branch 'net-ipa-GSI'