Merge "Fix: Firewall: NMS inverts default rule behavior"