backport-ipaddress

[test]
pytest
