Merge branch 'tb/check-crlf-for-safe-crlf'