15 Commits (feature/sql-semaphore1)