Merge branch 'tb/apply-with-crlf'