Merge "Several changes to VDM Demo apps" into main