Resolve #3496257 "Race conditionsbad lock"

catchrequested to merge
issue/drupal-3496257:3496257-race-conditionsbad-lock into main

Closes #3496257

Merge request reports