Merge "Support non-numerical virtual camera id" into main