BUG-8858: rework singleton group locking