Merge "Several fixes to the VDM demo apps" into main