Evaluation modules different configs possible
Merge remote-tracking branch 'origin/develop' into develop-MDP