Merge to tag public-0.5 (vrouter)