Fix for stress_test branch update 27.04.2018

Updating the sources to work with the latest stress test build.

First public release

Enjoy!