Merge branch 'fix/no-image-upload-filetype' into 'develop'