once more around the block
Merge branch 'feature/semaphore-plugin'