Merge pull request #4124 from semaphoreui/cursor/critical-bug-investigation-89f2