refactor: make sure current state is always set from target state
1 related merge request: !1246 cleanup a bunch of stuff related to compare and swap requests
17 jobs
20 minutes 19 seconds, queued for 4 seconds