Explicit that yubikey otp is optional
Merge branch 'test' into dev
dist