AA: firewall: merge r34472 and r34569