VE-1344: Fix by implementing "semaphore"
Merge pull request #4172 from Wikia/VE-1344

VE-1344: Fix by implementing "semaphore"