WIP: properly support multivalued controls

Change-Id: If14753d8da9113a81d044bd78d66f5fc0877ea22