Not sure I fully understand, so quick question about this PR 
Why do the modifications specifically target s3-related files, when the forced download occurs even when not using s3? 
Will it fix the issue in general anyway?
Will it also fix forced download for other files that could be opened in the browser such as PDFs?