Fixes #3633 - store option -v into context