Merge "Improve virtual camera VDM implementation" into main