Merged broder's changes into invirt-base