Merge branch 'nl/credential-crlf'