Add option_values to variant template [api]

Fixes #3460