Merge branch 'fix-internal-server-errors' into 'master'

Fix: HIC-99 Internal server error when uploading reports

See merge request !11