'vrouter' fixes from master to 1.05