Checkstyle compliance topic
Merge pull request #1874 from pveentjer/checkstyles-topic

Checkstyle compliance topic