keychain fix
Merge branch 'release/r8p1'