Merged upstream changes to cube

I updated the branches history to remove the .env files from the commit history. I tested the log-dashboard with the updated cube server, and everything still seems to work.