Cannot remove ids this way because of racing condition.
Merge branch 'issue/348_361_Retry_failed_media_uploads' into develop