Merge remote branch 'upstream/master' into custom-init
Fixing vmi_init to automatically add the VMI_CONFIG_FILE flag
Merging fix from custom-init