Catch-up merge from master sources @186077 to branch/2014-03-30/addrset.