added object ref name override support
CS
no special handling of scalars for now
Merge branch 'object-ref'