[3.8.6] Improve vm build