Merge "VDM Demo small improvements" into main