Merge branch 'np/credential-cache-sighup'