Merge "Change mutex to counting semaphore" into feature/zuulv3