Merge branch 'release/r2'
keychain support