Merge branch 'hotfix/fix_broken_upload_pages'
Removed some log calls filling up the log files
Merge branch 'hotfix/fix_logging_issue' into develop