keychain fixes
Merge branch 'release/r3p1'