Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maint