keychain handling change
Merge branch 'release/1.0.20'