UPGRADE: mpr pak
FEATURE: Add conditional for IPv6 in directives
CLEANUP