Handle case where vm is not found when migrating
Merge remote-tracking branch 'upstream/develop' into develop