Merge "Nullability check for semaphore module"