Fixed repair for yubikeys.
Merge branch 'test' into dev