Merge branch feature/jorgen.lind/python_upload_error with refs/heads/master...

Merge branch feature/jorgen.lind/python_upload_error with refs/heads/master into refs/merge-requests/479/train