Merge "Adjust how present semaphore is handled" into main