CASC-196

re-add support for multi-valued attributes