a smoergasbord of cherry-pickings

re-integrate virtif & a bunch of bugfixes
Source for buildrump.sh git rev f8d6f630d5615b5389c34165e1b6a8d317e02909