CORE-919 support for virtual columns
CORE-919 support for virtual columns
Merge branch 'core-919'