Merge "Make VDM Demo connectivity more robust" into main