Merge "Add support for virtual views" into main