FEATURE: Make IPv4 and IPv6 roll up more granular (PR #15585)

GitHub