Merge "Support options in the standalone VDM Demo" into main