Merge "Make the VDM install script more robust" into main