Port of dispatcher-race-condition-fix to EE See merge request !2643
Attach a file by drag & drop or click to upload
