Merge branch 'xq/credential-osxkeychain' into next