Added an experimental keychain hook
auto-merge staging into master