Include -v switch support. Fixes bug #7911