synchronzing vmdev with prod because copypasta.