Merge branch 'bugfix/mdii-uploader' into 'develop'