Stripping Litus part 7
Merge branch 'dev-upload' of github.com:LitusProject/Litus into dev-upload