Merge branch 'daniel/evaluations-visible'