keychain improvements
Merge branch 'release/r3'