fix(api): race conditions in eviction#2100

jakubno wants to merge 7 commits intomaine2b-dev/infra:mainfrom

fix/prevent-race-in-evictione2b-dev/infra:fix/prevent-race-in-evictionCopy head branch name to clipboard