Merge "Fixing ForwardingRulesManager code that got lost in a previous merge"