Merge remote-tracking branch 'origin/setup-semaphore' into setup-semaphore