Reapply same changes as before resolving the conflicts

1 job for develop-SPEI
in 36 seconds, using 0 compute credits, and was queued for 1 second