Merge branch 'UploadRequiredCheckFailed' into 'develop'

Fixes #12398. All combinations of new/existing upload should now be handled correctly.

See merge request !336
3 jobs for develop in 3 minutes and 48 seconds (queued for 1 second)