Enable keyring again
Merge remote-tracking branch 'chiiph/bug/properly_enable_keyring' into develop