Added global options for yubikeys
Merge branch 'test' into dev