attempt to trace down last failing test on Jenkins
Merge branch 'devel' into feature/multicore-archer
Cleanup doesnt take an argument. Ran into by Antons.