Several changes & improvements (offline testing)
Merge branch 'master' of https://github.com/dime-project/dime-server