Merge branch/2014-02-23/mvff-tune into branch/2014-04-15/mvffnoseg.
Catch-up merge from branch/2014-03-30/addrset to branch/2014-04-15/mvffnoseg.