Merge branch 'tb/dedup-crlf-tests'