locking issues on edge nodes [RTFACT-20516]