Also having the 504 (gateway timeout) issue with large file uploads.
Increasing the timeouts solved it for me. I wrote about that here: