Merge "Changes to rd balance and multi-arf bug fix."