Merge "Working VDM Demo apps in gerrit." into main