Merge branch 'fix/removing-mdii-uploader-from-descriptions' into 'develop'