Merge branch 'hotfix/fix_evaluations' into develop

* hotfix/fix_evaluations:
  fix evaluationg
Merge branch 'develop'

* develop: