fix vm contact + product-axe + prehome
Merge remote-tracking branch 'upstream/master'