Merge "Fix for bug with external chain and no arp"