Merge branch 'bugfix/upload_with_question_mark' into 'develop'