Merge branch 'tz/cred-netrc-cleanup'