Layout improvement Semaphore; mostly adding @Override annotation.
Merge pull request #1478 from pveentjer/improvement/3.x/semaphore-layout-improvement

Layout improvement Semaphore; mostly adding @Override annotation.